From: Dan Winship <danw@gnome.org>
Date: Tue, 27 Sep 2011 18:55:38 +0000 (-0400)
Subject: keyboard: ignore D-Bus requests when the OSK isn't enabled
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7535
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6aa411fecc79c091d7db3180c628dc4cb8e38ea9;p=gnome-shell.git

keyboard: ignore D-Bus requests when the OSK isn't enabled

Fixes spurious warnings about "this.actor is null" when processing
org.gnome.Caribou.Keyboard messages when the keyboard isn't enabled.

https://bugzilla.gnome.org/show_bug.cgi?id=659940
---

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index ffcb3875c..2eb355fb0 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -476,6 +476,9 @@ Keyboard.prototype = {
 
     // D-Bus methods
     Show: function(timestamp) {
+        if (!this._enableKeyboard)
+            return;
+
         if (timestamp - this._timestamp < 0)
             return;
 
@@ -484,6 +487,9 @@ Keyboard.prototype = {
     },
 
     Hide: function(timestamp) {
+        if (!this._enableKeyboard)
+            return;
+
         if (timestamp - this._timestamp < 0)
             return;
 
@@ -492,10 +498,16 @@ Keyboard.prototype = {
     },
 
     SetCursorLocation: function(x, y, w, h) {
+        if (!this._enableKeyboard)
+            return;
+
 //        this._setLocation(x, y);
     },
 
     SetEntryLocation: function(x, y, w, h) {
+        if (!this._enableKeyboard)
+            return;
+
 //        this._setLocation(x, y);
     },